Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JarHell caused by latest software.amazon.awssdk 2.20.141 #616

Merged
merged 1 commit into from
Sep 13, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Sep 6, 2023

Description

JarHell caused by latest software.amazon.awssdk 2.20.141

Issues Resolved

Closes #615

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@@ -242,7 +242,7 @@ public void testCatPitSegments() throws Exception {

assertNotNull("PitSegmentsResponse.segments() is null", PitSegmentsResponse.valueBody());
assertTrue("PitSegmentsResponse.segments().size() == 0",
PitSegmentsResponse.valueBody().size() > 0);
PitSegmentsResponse.valueBody().isEmpty());
Copy link
Collaborator Author

@reta reta Sep 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finally, test becomes logical: it was an issue fixed recently, the Cat API for PIT segments returned header row twice.

@reta reta added the bug Something isn't working label Sep 6, 2023
@reta
Copy link
Collaborator Author

reta commented Sep 12, 2023

@VachaShah @dblock could you please take a look folks? the checks are broken for this repo ...

@VachaShah
Copy link
Collaborator

@VachaShah @dblock could you please take a look folks? the checks are broken for this repo ...

Thank you for fixing this @reta!

@reta
Copy link
Collaborator Author

reta commented Sep 13, 2023

@dblock mind please? thank you

@dblock dblock merged commit 7be86f3 into opensearch-project:main Sep 13, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Sep 13, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-616-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7be86f3d828a7372cd908b7a3c1930b428fbed76
# Push it to GitHub
git push --set-upstream origin backport/backport-616-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-616-to-2.x.

reta added a commit to reta/opensearch-java that referenced this pull request Sep 13, 2023
dblock pushed a commit that referenced this pull request Sep 14, 2023
@BrendonFaleiro BrendonFaleiro mentioned this pull request Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] JarHell caused by latest software.amazon.awssdk 2.20.141
3 participants